bitkeeper revision 1.1159.78.1 (4149adf72Gb8APRtx2_hA1cGWLUEOQ)

all build without front end drivers

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 441337485c1ab82e2ccaf79d1b87ea18ce7c9c44..519c80013feeb130d663e40f079d8c64a4b462c2 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -39,6 +39,7 @@ rn@wyvis.camb.intel-research.net
 rn@wyvis.research.intel-research.net
 rneugeba@wyvis.research
 rneugeba@wyvis.research.intel-research.net
+shand@spidean.research.intel-research.net
 smh22@boulderdash.cl.cam.ac.uk
 smh22@labyrinth.cl.cam.ac.uk
 smh22@tempest.cl.cam.ac.uk

diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c
index 3a97f04a2a3237ed1f77491413428319c577fb9d..94ad6175ce94507e8d3c187568778af3f77789ee 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/kernel/reboot.c
@@ -60,10 +60,15 @@ static void __do_suspend(void)
     suspend_record_t *suspend_record;
 
     /* Hmmm... a cleaner interface to suspend/resume blkdevs would be nice. */
+       /* XXX SMH: yes it would :-( */ 
+#ifdef CONFIG_XEN_BLKDEV_FRONTEND
     extern void blkdev_suspend(void);
     extern void blkdev_resume(void);
+#endif
+#ifdef CONFIG_XEN_NETIF_FRONTEND
     extern void netif_suspend(void);
     extern void netif_resume(void);    
+#endif
     extern void time_suspend(void);
     extern void time_resume(void);
     extern unsigned long max_pfn;
@@ -77,9 +82,13 @@ static void __do_suspend(void)
 
     __cli();
 
+#ifdef CONFIG_XEN_NETIF_FRONTEND
     netif_suspend();
+#endif
 
+#ifdef CONFIG_XEN_BLKDEV_FRONTEND
     blkdev_suspend();
+#endif
 
     time_suspend();
 
@@ -130,9 +139,13 @@ static void __do_suspend(void)
 
     time_resume();
 
+#ifdef CONFIG_XEN_BLKDEV_FRONTEND
     blkdev_resume();
+#endif
 
+#ifdef CONFIG_XEN_NETIF_FRONTEND
     netif_resume();
+#endif
 
     __sti();